From f5bf23dafd3b5cdd2e7f7874cea8914d61681d85 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Wed, 15 Jun 2005 04:20:11 +0000
Subject: [PATCH] Fix some docs

---
 ChangeLog          |  5 +++++
 ChangeLog.pre-2-10 |  5 +++++
 ChangeLog.pre-2-8  |  5 +++++
 gtk/gtkwindow.c    | 24 +++++++++++++++---------
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 40994db64d..1e9a8dde1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-14  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_parse_geometry):
+	Fix up the example.  (#307699, Michal Suchanek)
+
 2005-06-14  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkcalendar.c: Update num_marked_dates as we
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 40994db64d..1e9a8dde1d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-06-14  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_parse_geometry):
+	Fix up the example.  (#307699, Michal Suchanek)
+
 2005-06-14  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkcalendar.c: Update num_marked_dates as we
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 40994db64d..1e9a8dde1d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-06-14  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkwindow.c (gtk_window_parse_geometry):
+	Fix up the example.  (#307699, Michal Suchanek)
+
 2005-06-14  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkcalendar.c: Update num_marked_dates as we
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 26de8e3593..d0e73148c8 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -7044,11 +7044,21 @@ gtk_XParseGeometry (const char   *string,
  * on the window.
  * 
  * <informalexample><programlisting>
+ * #include &lt;gtk/gtk.h&gt;
+ * 
+ * static void
+ * fill_with_content (GtkWidget *vbox)
+ * {
+ *   /<!-- -->* fill with content... *<!-- -->/
+ * }
+ * 
  * int
  * main (int argc, char *argv[])
  * {
- *   GtkWidget *window, vbox;
- *   GdkGeometry size_hints;
+ *   GtkWidget *window, *vbox;
+ *   GdkGeometry size_hints = {
+ *     100, 50, 0, 0, 100, 50, 10, 10, 0.0, 0.0, GDK_GRAVITY_NORTH_WEST  
+ *   };
  *   
  *   gtk_init (&amp;argc, &amp;argv);
  *   
@@ -7059,10 +7069,6 @@ gtk_XParseGeometry (const char   *string,
  *   fill_with_content (vbox);
  *   gtk_widget_show_all (vbox);
  *   
- *   size_hints = {
- *     100, 50, 0, 0, 100, 50, 10, 10, 0.0, 0.0, GDK_GRAVITY_NORTH_WEST  
- *   };
- *   
  *   gtk_window_set_geometry_hints (GTK_WINDOW (window),
  * 	  			    window,
  * 				    &amp;size_hints,
@@ -7076,10 +7082,10 @@ gtk_XParseGeometry (const char   *string,
  *         fprintf (stderr, "Failed to parse '&percnt;s'\n", argv[1]);
  *     }
  *    
- *    gtk_widget_show_all (window);
- *    gtk_main ();
+ *   gtk_widget_show_all (window);
+ *   gtk_main ();
  *    
- *    return 0;
+ *   return 0;
  * }
  * </programlisting></informalexample>
  *
-- 
2.30.2